*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 926318a4f564ba51420d5be2079c270ea608c014..96597a6748bbf952a259fc48d3cae0df4562f595 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2006-09-16  Richard Stallman  <rms@gnu.org>
+
+       * textmodes/conf-mode.el (conf-mode-map): Use conf-space-keywords cmd.
+       (conf-space-mode): Don't handle prefix arg.
+       Delete conf-space-keywords-override code.
+       Use add-hook.
+       (conf-space-keywords): New command.
+       (conf-space-mode-internal): Be careful with imenu-generic-expression.
+       Delete conf-space-keywords-override code.
+       (conf-space-keywords-alist): Doc fix.
+       (conf-space-font-lock-keywords): Doc fix.
+       (conf-space-keywords-override): Var deleted.
+
 2006-09-16  Chong Yidong  <cyd@stupidchicken.com>
 
        * startup.el (fancy-splash-screens): Don't switch to the scratch

diff --git a/src/ChangeLog b/src/ChangeLog
index 63656fd23f3ddadfb340d1f745dafdf2960ef6c6..1db2642b0fc8a019ed61e76aa73e712c619e29a2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -18806,6 +18806,14 @@
 
        * Makefile.in (fns.o): Depend on coding.h.
 
+2003-01-06  Dave Love  <fx@gnu.org>
+
+       * fns.c: Include coding.h.  Use POINTER_TYPE*, not void*.
+       (Vlocale_coding_system): Declare.
+       (Qcodeset, Qdays, Qmonths, Qpaper): New.
+       (Flanginfo): New.
+       (syms_of_fns): Initialize new stuff.
+
 2003-01-07  Markus Rost  <rost@math.ohio-state.edu>
 
        * minibuf.c (Fread_variable): Doc fix.